From: Carlos Garnacho <carlosg@gnome.org>
Date: Tue, 24 Mar 2020 23:34:58 +0000 (+0100)
Subject: st: Apply css foreground color to text as a PangoAttribute
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~751^2^2~67
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=66c4b1a8b607600f193b34e6a9f8c85f76c2ac2c;p=gnome-shell.git

st: Apply css foreground color to text as a PangoAttribute

Rely on the Pango renderer handling this properly, instead of tinting
the full ClutterText in the color specified through css.

Also set the caret color explicitly, since it used to be set as a side
effect of clutter_text_set_color(), but no longer is.

Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/850
---

diff --git a/src/st/st-private.c b/src/st/st-private.c
index 3107a0cf2..db18587c7 100644
--- a/src/st/st-private.c
+++ b/src/st/st-private.c
@@ -115,18 +115,23 @@ _st_set_text_from_style (ClutterText *text,
   StTextDecoration decoration;
   PangoAttrList *attribs = NULL;
   const PangoFontDescription *font;
+  PangoAttribute *foreground;
   StTextAlign align;
   gdouble spacing;
   gchar *font_features;
 
-  st_theme_node_get_foreground_color (theme_node, &color);
-  clutter_text_set_color (text, &color);
-
   font = st_theme_node_get_font (theme_node);
   clutter_text_set_font_description (text, (PangoFontDescription *) font);
 
   attribs = pango_attr_list_new ();
 
+  st_theme_node_get_foreground_color (theme_node, &color);
+  clutter_text_set_cursor_color (text, &color);
+  foreground = pango_attr_foreground_new (color.red * 255,
+                                          color.green * 255,
+                                          color.blue * 255);
+  pango_attr_list_insert (attribs, foreground);
+
   decoration = st_theme_node_get_text_decoration (theme_node);
   if (decoration)
     {